From: Simon McVittie <smcv@debian.org>
Date: Mon, 13 Oct 2025 14:21:43 +0000 (+0100)
Subject: Revert "Generate a versioned dependency for the GLib 2.86 transition"
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~82^2~2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=112aad6bc46ce6c56764c685358b835640082374;p=gnome-shell.git

Revert "Generate a versioned dependency for the GLib 2.86 transition"

This reverts commit 816fa364ba112b48f62f03ffa054cafd9bd14b76.
---

diff --git a/debian/clean b/debian/clean
index 1789feeee..3d6866b91 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,2 +1 @@
-debian/local.substvars
 debian/home/
diff --git a/debian/control b/debian/control
index a24dee6c8..675e5b65f 100644
--- a/debian/control
+++ b/debian/control
@@ -111,7 +111,6 @@ Depends: gir1.2-accountsservice-1.0,
          python3,
          tecla,
          ${gir:Depends},
-         ${local:Depends},
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: bolt,
diff --git a/debian/extra-substvars.sh b/debian/extra-substvars.sh
deleted file mode 100755
index 959c28f4a..000000000
--- a/debian/extra-substvars.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# Copyright 2025 Simon McVittie
-# SPDX-License-Identifier: MIT
-
-glib_version=$(dpkg-query -W -f '${Version}' "libglib2.0-dev:$DEB_HOST_ARCH")
-
-if dpkg --compare-versions "$glib_version" ge 2.86; then
-    echo "local:Depends=gir1.2-glib-2.0 (>= 2.86.0)"
-else
-    echo "local:Depends=gir1.2-glib-2.0 (<< 2.86.0)"
-fi
diff --git a/debian/rules b/debian/rules
index 3b9df99cd..2d609f488 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,9 +69,3 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 endif
 
 override_dh_gnome_clean:
-
-debian/local.substvars:
-	dpkg-architecture -c debian/extra-substvars.sh > $@
-
-override_dh_gencontrol: debian/local.substvars
-	dh_gencontrol -- -Tdebian/local.substvars